Skip to content

Fix testCancelOnExpiry#146015

Merged
elasticsearchmachine merged 2 commits intoelastic:mainfrom
dnhatn:fix-testCancelOnExpiry
Apr 10, 2026
Merged

Fix testCancelOnExpiry#146015
elasticsearchmachine merged 2 commits intoelastic:mainfrom
dnhatn:fix-testCancelOnExpiry

Conversation

@dnhatn
Copy link
Copy Markdown
Member

@dnhatn dnhatn commented Apr 9, 2026

The test failed because it used a small keep_alive on submission, leading to cases where data-node drivers were slow to start and the query was cancelled before any driver had started. This PR modifies the test to check for cancellation in two steps: submit with a large keep_alive and wait until at least one data-node driver has started, then adjust the keep_alive to a much smaller interval and expect cancellation to happen.

Closes #145502

@dnhatn dnhatn added v9.4.1 v9.3.4 v9.2.9 v8.19.15 :Analytics/ES|QL AKA ESQL >test Issues or PRs that are addressing/adding tests auto-backport Automatically create backport pull requests when merged auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) labels Apr 9, 2026
@dnhatn dnhatn marked this pull request as ready for review April 9, 2026 20:03
@elasticsearchmachine elasticsearchmachine added the Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) label Apr 9, 2026
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-analytical-engine (Team:Analytics)

@elasticsearchmachine elasticsearchmachine merged commit ff30fad into elastic:main Apr 10, 2026
35 checks passed
@dnhatn dnhatn deleted the fix-testCancelOnExpiry branch April 10, 2026 00:48
dnhatn added a commit to dnhatn/elasticsearch that referenced this pull request Apr 10, 2026
The test failed because it used a small keep_alive on submission,
leading to cases where data-node drivers were slow to start and the
query was cancelled before any driver had started. This PR modifies the
test to check for cancellation in two steps: submit with a large
keep_alive and wait until at least one data-node driver has started,
then adjust the keep_alive to a much smaller interval and expect
cancellation to happen.

Closes elastic#145502
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

💔 Backport failed

Status Branch Result
9.2 Commit could not be cherrypicked due to conflicts
8.19 Commit could not be cherrypicked due to conflicts
9.3 Commit could not be cherrypicked due to conflicts
9.4
9.5 The branch "9.5" is invalid or doesn't exist

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 146015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Analytics/ES|QL AKA ESQL auto-backport Automatically create backport pull requests when merged auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport pending Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) >test Issues or PRs that are addressing/adding tests v8.19.15 v9.2.9 v9.3.4 v9.4.1 v9.5.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CI] AsyncEsqlQueryActionIT testCancelOnExpiry failing

2 participants